Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 12 Jul 2011 17:38:05 +0000 (10:38 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 12 Jul 2011 17:38:05 +0000 (10:38 -0700)
commit834ed67d4ccc7b484630dfa7544f0113755bb4d5
tree6023d6418ead02c1666ebaa585fc64e3d1529ec6
parentce67271235416eec13afa85b2cb9ca78e6c906f7
parent9fb72a5bf8347bd1b940369d6775de5eccf4dbc3
Merge from trunk.
ChangeLog
configure.in
src/ChangeLog
src/xdisp.c